Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 31 Oct 2005 16:14:59 +0000 (17:14 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 31 Oct 2005 16:14:59 +0000 (17:14 +0100)

Trivial merge